bitkeeper revision 1.1159.142.9 (41868212HJLlpN1lDwN7zKigin-5tA)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 1 Nov 2004 18:36:02 +0000 (18:36 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 1 Nov 2004 18:36:02 +0000 (18:36 +0000)
Minor Makefile fixes

tools/Makefile
tools/libxc/Makefile
tools/libxutil/Makefile

index 527edab8baa87b8dd7fc0d221c035120367dab1f..6c9855bed7b5f3aee5ae680c6b23c031b1f3c2a2 100644 (file)
@@ -9,7 +9,10 @@ all:
        $(MAKE) -C python
        $(MAKE) -C xfrd
 
-install: all
+install: 
+ifneq ($(dist),yes)
+       $(MAKE) -C check install
+endif
        $(MAKE) -C libxutil install
        $(MAKE) -C libxc install
        $(MAKE) -C misc install
index 761e43c6326a71db4e22d0d9736912f5956dd372..9a623bcc6b69b5c19786e179aaf9b36e74d1d95d 100644 (file)
@@ -58,6 +58,8 @@ install: all
        mkdir -p $(prefix)/usr/lib
        mkdir -p $(prefix)/usr/include
        install -m0755 $(LIB) $(prefix)/usr/lib
+       ln -sf libxc.so.$(MAJOR).$(MINOR) $(prefix)/usr/lib/libxc.so.$(MAJOR)
+       ln -sf libxc.so.$(MAJOR) $(prefix)/usr/lib/libxc.so
        install -m0644 xc.h $(prefix)/usr/include
 
 clean:
index 0b665bc10d5e9e91ee3a7d22f3f27e313013ee4e..ec453f1af8596958ca48447ec4c4040ffc6fc1ba 100644 (file)
@@ -52,6 +52,8 @@ check-for-zlib:
 install: all
        mkdir -p $(prefix)/usr/lib
        install -m0755 $(LIB) $(prefix)/usr/lib
+       ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(prefix)/usr/lib/$(LIB_NAME).so.$(MAJOR)
+       ln -sf $(LIB_NAME).so.$(MAJOR) $(prefix)/usr/lib/$(LIB_NAME).so
 
 clean:
        $(RM) *.a *.so *.so.* *.o *.rpm